Fixed theme and header issues