[IMP] Getting rid of unused imports
[IMP] Getting rid of unused methods and buttons
[IMP] Getting rid of unused buttons & methods
[IMP] Improving views for commission