A lot of improvements

* Code Cleanup
* Design changes
* Minor bug fixed
* Better usability