fix layout and various functionality issues
save data image show on production