Added wells, lined up buttons and text