Added navigation stuff, fixed duplicating records