view sources and same refactories
navigation and fixed bugs