some more fixes in stinky layout