ui updates
updating switch between table/collection
updated navigation bar for layout features
layouts working, icons added
Merge pull request #2 from jmr12345/development

Layout functionality working, UI updated