Remove obsolete messages
Correct the layouts