Few style updates and navigation changes