Slight text change and templates/styles tuning