Fiddles with layout a bit