Improve review template