Layout changes and icons