This is only the first step but already looking a bit nicer.

Change-Id: I79f027b3411245ffe2fe654b4ca6eccbdf6a147b
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>