Fixed moniker bug
Design changes