More responsive layout, a few bugfixes