nav alignment fixed, other alignment tidy ups