Fix #64 & #71
XRevert "Fix #64 & #71"

This reverts commit 08b513f814c0ed8d07e78ed7b30aa7dea49948a4.
Revert "Fix #64, change window titles and breadcrumbs"

This reverts commit 5ee7388f893e8e7275793417924e6346d19a7be7.