#538 Put buttons in btn groups, fix table