Look and feel fixes
Look and feel fixes