Fixes layouts