Beautifying UI. minor updates