Fix the version script
Small changes for layout