Layout changes

Signed-off-by: Frode Marton Meling <fm@saltship.com>