Add mostly working basic widgets