Header improvements + sidebar