Added error notifications; Fixed style issues