Homepage & Header cleanup