WIP layout adjustments