Widget layout changes

Fixed most obvious widget layout problems with spacing/alignment.