Major UI and Code Fix