Further buttons and forms imp (closes #5)