Updated user interface and removed some bugs