Revert 3c9244d..346f8a0

This rolls back to commit 3c9244de1acda308a79e8228f1fd33d3d6673a09.
Revert b3d5640..998229f

This rolls back to commit b3d564084b6d8513a79cd227bd991ea4c6a345cc.
Merge branch 'adding-CSS'