Implement restaurant lookup and cleanup some views