Major UI and service changes