Improve HTML codes on system module