Some fixes + gui improvements