#41 Added buttons and improved layout, more work needed