Some cleanup... Only Nav issue remaining