some code cleanup
cleanup and added down buttons