Major Changes to UI. More Organized