Took out one "highlight" bug, altered User Interface slightly