Some fixes + added gui for dev mode