Fixing side-by-side and disabled fields