some changes for better layouting