get more of UI working correctly