Rework widget area classes