added organize UI stuff