Move display options to client

Fixed #579