bug correction and code cleanup
icon added to +, - and go to buttons