Fix more top margin/padding issues for widgets