Updated the tag layout for one-screen setups