V 1.1

Refactored code and updated look.