Improved responsive design. Fixed message selection