fixing alignment and scripts wrapper