Refactored out header. added extra controlls