Added catch UI and fixed some bugs