changed view structure
update structure
update style structrue
Merge branch 'feature/changeToNewStructure' into develop