widget cleanups, register them properly