Continued working on UI