Did some working on UI