Fixed If/Else statements on page