Fix usage and move button to previous location