Fixed username bug, added line highlight feature