Started organizing views, index view partially completed