Added basic scaffolds and updated main navigation