add decorators and fix styling tables