added some views, changed file names