Layout tweaks; package update
