Cleanup

GUI layout again, some database update.