Update 1.2 Fixed buttons and improved layout