Improved Layout and added warning.