Refactoring with GMB
UI Adjusting.. (in progress)