Layout designed and minor fixes