Final screen changes
Merge branch 'master' of https://github.com/dmayboroda/crab