Layout fixes (first part)
Small fixes