app redesign
Fixed conflicts