Add migration utility and cleaned up screen formats