Table styles + minor improvements