merged seperate modules and added new view