Fix UI and add more features