Improved some layout.