Bits and bobs

Clean up and bits and bobs in preparation for converting to bootstrap 3