Changed layout and integrate upper menu in all the pages