Improve sharing
Fix layout a bit