Fixed error messages & rearranged ActionController