Playing with the layout
Merge remote-tracking branch 'origin/new_ui' into development
Playing with the new design #28