Review forked Smart Table

Fixed as per your review comments