Fixed most of the autosizing