Back to list navigation; Clean some stuff up