- start working on UI cosmetic part with a lot of changes