Fix row alignment and change highlight color