Styling and page fixes