layout change and images are not hardcoded
merge