Fixed the size issues