Cleaning up some examples and removing clutter

We want to use more layouts in our examples as it is the
recommended way to create tool bars etc.

Change-Id: Ib3b1e8e907cc5277d522557a19d2c294a7d251b1
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>