Implemented CSS changes for demo
merged master onto bsharanya-assignmentlibrary