look and feel fixes