Fix the group extend calls
Adjust bucket media spacing