Look and feel fixes and improvements