Altered hover color and size, added horizontal divider
fixed merge conflicts