Refactored views and styles.
Merge pull request #7 from renechz/master

Refactored views and styles.