Size and postion of components revised
Code optimization