added navigation, clean up code
added system with web and db components