Adapted UI
Merge branch 'master' of git@github.com:Josvanegmond/androidmoonbase