[FIXED] TODO panel and some refactor