Small bugs correction, ready to move into page creation