Add layouts and new key widgets (not functional yet)