change views to reflect correct ordering of thoughts, eliminate duplicate helper methods, testing of view order