restructured code
?? I am not sure how to use this class ???
UI fixes
Minor adjustments