069 Added UI controls, changed layout