Added more icons, redesigned navigation