UI problems fixed, bugs fixed.

It is really slow now though, but I'm getting ready to package (again).