Various bug fixes following major CSS overhaul