Improving navigation and organizing css