Cosmetics

Cosmetic fixes to improve usablilty