some clean up, moved simple if statements to one liners
organized layouts