Improve layout, and add settings view.