fix fails B-)
conflicts management in Start Pages
minor fixes
merge case in Start Pages