Added navbar and corrected reference issues

Added navbar and corrected reference issues