look and feel improvements and implementation