removed if statements from views
reorganized header implementation
reorganized file layout on server side