UI Fixes, including re-implementing field widths