Move size attributes into style