refactor circle + prepare nav