Minor changes to layout and warning message.