Add more controls and info