fixed main navbar active button highlight, cleaned up some god awful indentations