Cleaned up views on front page