Rearranged the UI to have tabs instead