Cleaning up look and feel