Fixed several issues including dialog, highlighting, and more