Layout improvements in main view