Working on improving UI