Pages and navbar updated