Updated UI to support tabbed interface