GUI Updates & Fixes
Near Completion v1