First If statement and header message change
Contoller fixes