Ui cleanup, sandbox improved