Final layout & help text fixes