improve layout a little
bunch of bugfixes