Alignment issues and toggle issues fixed
Fixed merge errors
Fixed alignment and toggle issues