modified some layout