Tidy up formatting and fix where moving cards breaks