Reorganised navbar + added content