Bug Fixes

A few bug fixes related to the new look & feel earlier.