Refactored to include navbar