editing layout for better flexibility