Changed widgets to structure highlighting, removed excess whitespace