Refactored actor, added error page