New UI, buttons, and functionality - Second Try