Style cleanup and showing context of search