Styling improvments and more elements on page