Switch to one single layout. This is too hard