Fixed Layout issues, still contain minor layout issues.