Few UI changes and slight code cleaning