Change "if" to "else if"
Minor layout modifications