Fixed div/highlight issues