updated tables, styling and buttons
fixed merge conflict