New layout, bugfixes and tweaks