refactoring views
css refactored
css refactored
conflicts solved
Merge pull request #48 from dashinfall3/omar

Omar