Look and feel and translation cleanup