Re-organize documentation, tweak shelf buttons