fixed rest of the UI bugs