UI - small cosmetic changes