Grid-based UI and bugfixes