Revert "Revert "Little improvments and major layout change""

This reverts commit 1112d5a7d501563eb57b2b0e726efdba672f567a.