some code cleanup
tabbed view switching, proper naming convention