Changed position of >>, << buttons
Merge branch 'Michael' into Version1