Added controls and links