Major UI changes, final handing changes 4