changed class structure for layout.
layout improvement.
layout improvement.