Message to message name

and ui bug fixes after an update