added skip to start/end controls and shuffled layout around