Mostly just added labels, changed positioning on things.