Creating guides section
Merged and fix conflicts