New guides clean merge

Lots of change but mainly : 
Access points
Layout fixes