Improve views

Improve several views to provide a slightly better layout