Adjust sizes and redesign