bugs fixed, changed the ui