Rework layout a little bit and use the Grid Unit

Signed-off-by: Simon Busch <morphis@gravedo.de>
Merge remote-tracking branch 'ports/master'