Fixed equals reset and cleaned up UI

Done for now