upgraded navigation bar and style

contains #hack