Improve layout styles to fit in window