fixes #3
various layout shenanigans