do last fixes - improve ui