Many layout/design updates.
refs #145
refs #143