Fixed simulation glitch, some more UI tweaks.