Add style for widget edit/remove
Added grid order support