Fix layout, add release location