Bugfixes for site layout changes