Move some stuff into base widget