Made many changes to fix reactive widths