Fixed some hard coded view issues.