Merge pull request #4 from elyamac/latestBranch

Merged Simon's changes. A lot of UI changes.
Trying to fix incorrect merge.