Reordered a function
Changed selection colour.
Changed naming convention to _