Having a single button as separate form is wasteful.

Change-Id: I8d1f6dd9c88293c5e3d01fdc56db2aa094e82598
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>