Changed the UI a little and added a few more features