main refactor
added some views
minor fixes