Various improvements for sizing and look