fixed things
added todo
Merge pull request #30 from finninde/wienMainScreen

Wien main screen