Look and feel updates and bug fixes