Misc visual changes, bug fixes