added scale and fixed layout