Added Errors and Popups