Improve project template