Added more control elements.