Cambios mantis 171

Ajustes de apagina
Some small fixes
Merge branch '171'