added tabs
cleaned up layout
modals