Cleaned up some user interface issues - moving away from sucess page