Must fix UI and add some more features