Database Fixes, GUI Improvements

Still broken.