Change None to Hidden and fix spacing of else statements