Improve layout, mainly for compact views

Issue #2: more compact layout