menu alignment fix and caret hover fix
Merge remote-tracking branch 'origin/dev' into dev
menu alignment fix and caret hover fix