Handling restaurant page error and some other minor things