look and feel cleanup per Mike's Mockups