Code structure updates and a few new interface elements.
try to commit git