worked on basic UI, mostly navigation and file structure
corrected merge conflicts