Improve the UI by moving elements and tweaking CSS