macro refactor ui for performance. no more mention syntax