Touched up UI, added keyboard controls to test