Fixed UI, Changed storage location
Fixed ui