Improvements to look and feel