Edited layout and navbar