switched from buggy custom layout to flexbox