Fixing Layout and adding Type Scale