v4.1 refactoring views, cleaned up unnecessary code.