Improve layout a bit more. Test it.