add flexbox layout & finish button-groups