Added better UI and some code fixes