Corrected some layput issue