Error fix     Designed by Delight
Merge pull request #1 from NimitzDEV/cm-11.0

A layout fix and some UI improvements