Fixed more nested layout problems
Refactored some field logic
Changed transition to linear