fixing layout and message