updated with navbar