Done for the day; edited so that the appropriate top bar is showing at all times, and there's no strange redirection.