Minor changes

Changed some strings, removed unused widget class, made factory objects
immutable