Various bug fixes re how it looks