Adjusted Css and JS
Merge pull request #216 from ndomar/Adjusting_Css_&_javascript

Adjusted Css and JS
conflicts resolved
view done
UML done