UI and status code fixes