Expander alignment

Fixed some label/input alignment issues (https://bugz.meetup.com/show_bug.cgi?id=40576)