Some changes to make the layout a bit better (reverted from commit 1db512f2d8c0d9585873f986f565305e5d8e66e1)