redesign drawer, change photo layout
merge