Debugged and changed UI