New buttons and forms code added