doing some minor restructoring in the ui