Final fix for features grid