Changed some UI and return calls