Changing navbar type and minor changes