back to steam first, general layout cleanup