Version 2 with New Design
Deleted Stuff
Removed comment brackets
Merge branch 'New-CSS' into development