Fixed a bunch of bugs & beautified (Manisha & Malika)