control buttons added and tiny changes