Additional changes for better layouts