Fix errors and made better UI