Revised Control Panel
Fix some issues
Merge branch 'awkasem-master'