masser af UI
Merge pull request #9 from Klockz/UI-branch

masser af UI