fixing navigation and adding placeholders