updated with navbar and background