Added error messages and menu icon.