Added controls and index