Updated the case of status messages
Updated the options form