added side navigation
merge conflicts fixed