Minor header improvements. Top-bar being a pain.