Improve comment , user modules and theme