Custom size and few fixes