Fixed the screens (buttons can now be seen)
Merge pull request #16 from karencatearabit/cm-16

merge cm-16 to dev_1.0