cleaned up some content and button layout