Cleaned up HTML views, fixed index view