major refactoring, changed the main layout, addee tabbed view