Clean up the layouts, add some button functionality