More work on well look and feel