Fixed template rendering inconsistency
Fixed admin navbar